Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Dec 2011 10:20:29 +0000 (02:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Dec 2011 10:20:29 +0000 (02:20 -0800)

Trivial merge